Fixing GtkTreeViewColumn to use the new _gtk_cell_layout_buildable_custom_tag_end...

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 922e84e6c489964126b7bd3e5842a69215bc74ae..8d21b64e32d36f210ab4b6412b3ded589ffe40ae 100644 (file)
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -399,7 +399,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
 
 
 static void
-_gtk_entry_completion_buildable_custom_tag_end (GtkBuildable *buildable,
+gtk_entry_completion_buildable_custom_tag_end (GtkBuildable *buildable,
                                                GtkBuilder   *builder,
                                                GObject      *child,
                                                const gchar  *tagname,
@@ -414,7 +414,7 @@ gtk_entry_completion_buildable_init (GtkBuildableIface *iface)
 {
   iface->add_child = _gtk_cell_layout_buildable_add_child;
   iface->custom_tag_start = _gtk_cell_layout_buildable_custom_tag_start;
-  iface->custom_tag_end = _gtk_entry_completion_buildable_custom_tag_end;
+  iface->custom_tag_end = gtk_entry_completion_buildable_custom_tag_end;
 }
 
 static void

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index ed3ac9657be160e82cd56a19352a749ee56f34c0..f49e8fa13866034a6a27a86f74296694629b2a03 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -359,12 +359,23 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
 
 }
 
+static void
+gtk_tree_view_column_custom_tag_end (GtkBuildable *buildable,
+                                    GtkBuilder   *builder,
+                                    GObject      *child,
+                                    const gchar  *tagname,
+                                    gpointer     *data)
+{
+  /* Just ignore the boolean return from here */
+  _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);
+}
+
 static void
 gtk_tree_view_column_buildable_init (GtkBuildableIface *iface)
 {
   iface->add_child = _gtk_cell_layout_buildable_add_child;
   iface->custom_tag_start = _gtk_cell_layout_buildable_custom_tag_start;
-  iface->custom_tag_end = _gtk_cell_layout_buildable_custom_tag_end;
+  iface->custom_tag_end = gtk_tree_view_column_custom_tag_end;
 }
 
 static void